Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Wed, 22 Jul 2015 14:55:14 +0000 (15:55 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 22 Jul 2015 14:55:14 +0000 (15:55 +0100)
commitce6ce4a8a88fa7930838fc9fa06300bc43713671
tree8b58fca4be981de3bd6ce89dafe6662ce5c7951a
parenta08b914807b14a8328d005079d774e7f8efd1d24
parentafba7c6d9566f1556117b78e767f9678433a1f01
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging